remove <<<<. oops.

diff --git a/ChangeLog b/ChangeLog
index 62e9630f5dc350934715f57759397269167eee0f..a23318695efe74b0b49c2c2dce536f352c667a83 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -110,7 +110,6 @@
 
 2000-07-25  Havoc Pennington  <hp@redhat.com>
 
->>>>>>> 1.1355
        * gtk/gtkprogressbar.h: Implement new sane, 5-function API for
        using GtkProgressBar. See Changes-2.0.txt for details.
 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 62e9630f5dc350934715f57759397269167eee0f..a23318695efe74b0b49c2c2dce536f352c667a83 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -110,7 +110,6 @@
 
 2000-07-25  Havoc Pennington  <hp@redhat.com>
 
->>>>>>> 1.1355
        * gtk/gtkprogressbar.h: Implement new sane, 5-function API for
        using GtkProgressBar. See Changes-2.0.txt for details.
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 62e9630f5dc350934715f57759397269167eee0f..a23318695efe74b0b49c2c2dce536f352c667a83 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -110,7 +110,6 @@
 
 2000-07-25  Havoc Pennington  <hp@redhat.com>
 
->>>>>>> 1.1355
        * gtk/gtkprogressbar.h: Implement new sane, 5-function API for
        using GtkProgressBar. See Changes-2.0.txt for details.
 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 62e9630f5dc350934715f57759397269167eee0f..a23318695efe74b0b49c2c2dce536f352c667a83 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -110,7 +110,6 @@
 
 2000-07-25  Havoc Pennington  <hp@redhat.com>
 
->>>>>>> 1.1355
        * gtk/gtkprogressbar.h: Implement new sane, 5-function API for
        using GtkProgressBar. See Changes-2.0.txt for details.
 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 62e9630f5dc350934715f57759397269167eee0f..a23318695efe74b0b49c2c2dce536f352c667a83 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -110,7 +110,6 @@
 
 2000-07-25  Havoc Pennington  <hp@redhat.com>
 
->>>>>>> 1.1355
        * gtk/gtkprogressbar.h: Implement new sane, 5-function API for
        using GtkProgressBar. See Changes-2.0.txt for details.
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 62e9630f5dc350934715f57759397269167eee0f..a23318695efe74b0b49c2c2dce536f352c667a83 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -110,7 +110,6 @@
 
 2000-07-25  Havoc Pennington  <hp@redhat.com>
 
->>>>>>> 1.1355
        * gtk/gtkprogressbar.h: Implement new sane, 5-function API for
        using GtkProgressBar. See Changes-2.0.txt for details.
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 62e9630f5dc350934715f57759397269167eee0f..a23318695efe74b0b49c2c2dce536f352c667a83 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -110,7 +110,6 @@
 
 2000-07-25  Havoc Pennington  <hp@redhat.com>
 
->>>>>>> 1.1355
        * gtk/gtkprogressbar.h: Implement new sane, 5-function API for
        using GtkProgressBar. See Changes-2.0.txt for details.